Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:54:00 +0000 (22:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:54:00 +0000 (22:54 -0700)

Trivial merge